Made some stylistic changes for consistency