Code optimization and made some strings translatable