Updated coding style to match source code