Minor code changes related to formatting