Followed PMD recommendations
Removed unused interface
Followed PMD recommendations
Fixed merge conflict and added final