Changes in code format

additional structure added, removed ever annoying this in favor of colon
notation. Alignment changes.