more comments cleaned up codebase