Started cleanup of tidy functions.