removed excess spacing
renamed / reorganized