Removing else. The different cases are not mutually exclusive.
Fixed name to buffer to conform to the rest of the language.