Removed unused import
added @Override in a few areas.
Replaced key.equals("") with key.isEmpty()  instead