[#39] Remove unnecessary whitespaces and change wrong classes