Converting to keyword parameters
minor changes