Started with code cleanup