combed through and cleaned up