Change syntax and add types to few variables