cleaning up variable usage