Addressing review comments

 - enough with the gets already! :-)
 - new style boxing and enums
 - more idomatic var and method names