removed clutter and cleaned up