halfway cleaned up