cleaned up shit