Added interface methods and removed clutter