Fixing Maven build dep, fixed checkstyle formatting issues and headers