Changed coding style, variable name