Moritz Huebner: Implemented new type consistent syntax. Gets rid of a variable and ensures type safety