Replace “this.” with “@”
Refactor
Clean up
Refactor queries