Styling complete. Working on cleaning up codebase