Removed warnings by implementing diamond operators
Updated javadoc @param name
Removed unsused imports
Added Javadoc