commenting and cleanup