Final clean up and comments