Formatting, checkstyle pass 1