Some simplifications - factored out MNIST crap