removed unneeded dependencies
add additional tests for missing numbers
simplify case statement into array