Basic code clean-up.