Adresses some Checkstyle issues