Code santization updates and comments