added @Override to avoid confusion
spacing changes, little code tweaks.