Some cleanup/unhardcoding

Signed-off-by: Ricky Elrod <ricky@elrod.me>