Code clean-up to match checkstyle.