additional comments and clean up