Did some code aesthetics.