commenting updates and code simplification