More cleaning and added management!