Clean up and modernize code