Removed unused imports
convert Array syntax to short
Refactored controller