Minor optimization & cleanup