some small changes for readability