Clean up and minor changes