Cleanup prepare key methods and use single quotes