Stable - code cleanup