Build cleanup & checkstyle

Actually, multiply that by some large-ish prime number (something larger than 1000)