Rename file and clean up code