Fixing OCD issues