Code clean-up was performed.