Removed unused modifiers
Reordered modifiers
Removed singular fields
Removed unnecessary override methods
Merge branch 'feature/technical_debt' into develop