Build cleanup & checkstyle

Yeah this should be `return set.get();`