Cleaned up the head and tail incrementers