Removed unused import
Removed empty statement
Removed redundant throws
Removed trailing comments