Fixed camera rotation issue + minor cleanup