Fixed deprecation
Updated Maven for latest build tools
Code formatting