Class5, exercise1
Minor cleanup
Class5, exercise2