Assignment completed - final cleanup

Please see comments in previous commit