reorganize functions / constructors in class