MINOR CODE MAINTENANCE