Cleanup and various commenting