cleaned up, ready for pull