Simplify code, fix potential crash