General code clean-up...