Altered code style to conform with existing