additional comments and cleaning up