For code cleanup