Further Minor Changes - Style Complete