Few minor changes to form