Styling

merge styling into master instead of the other way around