Refactor contructor classes should have first capital