Removed unused imports
Removed unused variable
Extracted constants for duplicate literals
Added missing final to constant
Moved constant to correct location
Removed magic number