Cleaning by @hattieso