adding more setType in other forms + removing white spaces at eol