Clean up constructors, add comments