Rename some variables
Extract methods