replace string literal with constant
removed unused variable, organised imports
removed TODO after problem being fixed