cleaning up constructors and so on