Code Clean-up And Clarification. Any Changes are Noted in Comments.