Additional code comment documentation, cleaning up some flow.