cosmetic code changes for readability