just some simple changes for readability