Build cleanup & checkstyle

Fix link text