Removed unused imports and applied project naming convetions to added
methods