cleaned up; organized