Cleaned up unused imports, javadocs, print-stmt, switch-stmt, redundant code and made field variables final