Another attempt to clean up create note functionality