some more changes for simplicity/readability