Cleaned the style but the overall shape of this project is still a bit convoluted