some minor code readability improvements