cleaned up clutter