Rename code for clarity