Implement a few things from code review feedback

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>