Cleaned up checkstyle failures