fixing some styling, etc.

Added separate classes and structure changes to help organize