Clean up code a little bit and prepare for office hours