cleaned up code; easier to re-train and re-test;