Improve comments
Add parameterized queries