added funtion types and removed whitespaces