Updated to utilize checkstyles and findbugs