Build cleanup & checkstyle

now you are just nitpicking  :)