Minor code changes to help readablility