Fixed all the checkstyle problems