Some changes

Some alignments and style cleanups