More clean up for functionality