renaming and changing color
code reorganizing
cleanup