Simple code cleaning (no refactor)