Fixed from code cleanup