Eugene Simakin Small code cleanup