Code clean-up!