Moving everything to constructor's, it minimizes better that way.