Final adjustments; comments, styles & code clean up