Clean up and add reverse, reverseValeus