Clean up and minor implementations