Clean ups. Add a couple of methods.