Fixed more checkstyle warnings, updated buildtools version with variable