Just code cleanup