OCD changes and cleanup