Refactor: move constructor to the top of the class

Minor edit