More commenting/checkstyle