fixing constructor layout