Fix commented out code
Add note on naming things