Clean up and address comments