General clean-up, merged two classes