Code OCD changes and post fix