Simplify code even more. Reduced the binary size by over 500 bytes.