Some small changes for readability