begin code cleanup