Update exam 1, cleanup