Refactoring
Changed styling; a start