Clean field constructors (fix #5)