Cleaning up code and prepping for turn -in.