Minor comments changes and cleanup