Code prettifying, changing names, deleting lines...