Cleaned up checkstyle problems