Clean up & minor improvements