Style improvements

I improved layout of code a little.