Minor tweaks + checkstyle compliance