Code clean-up changes