cleaned up big time