Finished Assignment 2 - plus small changes in coding style