Build cleanup & checkstyle

reverted the old formating