Extract simple method
Remove unneeded deps
Rename function
Rename variable