rename/code polish