Final code beautification and cleaning up of loose comments that are no
longer relevant.