Fixed the styling, made sure that class variables are declared outside
the constructor but are instantiated within the constructor