Cleanup and adherence to strict