Clean-up. Moved trivial constructors/destructors, setters/getters up to the header files.