Micro fix, clean