Add construct method to form
improve psr2 indenting
Fix uses