Problems 1-10 (8-10 not ready) together in one class and stylistic changes