more cleaned up