Correcting code to comply with checkstyle tests.