Style fixes overal