Style fixes and stuff