Line up some parts of code (after review)