Made small code cleanup