changing syntax in a more consistent way (limit the use of keywords)