Renaming Homer, cleaning code