[Brandon] style changes to forms, removing types and perftools