Fix/styling

Cleaned it up a bit ;).