Code clean-up;