cleaning some semicolon warnings
correcting semicolon warnings
taking out color/size mapping