Remove "short" in favor of "int"
Declare accessor functions as const