rename file, code cleanup