Restyling things
merged