Review: code cleanup