cleaned up code ontime ticket 1220