Cleared all static code analysis warnings + maven build enhancements