before code cleanup/refactor