Modify source to  comply with checkstyle