Cleanup based on comments