Code clean-ups