Code review PR

I'm also not sure if we want to think about SQL injection, but probably not?