revert to cleaner code