Cleanup and more comments