tidy up variable settings