Some aesthetics code edits