Added styling, organized code