* minor changes to readability