Clean Code, modified TODOs inside code, small modifications endMenuActivity