added constructor, starting to refactor it
minor, just layout