commented out editing and cleaned up