-better flow and organization
-some cleanup