Updated code style to reflect current style