PROBCORE-453 Cleaning up code with help from Checkstyle