Cleaning up fromCode()