+ code cleanup