More commenting and cleanup