Updated localization, code cleanup. Closes #19