Begin cleaning up the less code.