Some code style improvements: removed redundant parentheses, added const, joined declaration and assignment of local variables