Fixes coding style issues: variables declaration and comments
Fixes coding style issues: variables declaration and comments

tzapzoor/marble,tzapzoor/marble,tzapzoor/marble,tzapzoor/marble,tzapzoor/marble,tzapzoor/marble,tzapzoor/marble,tzapzoor/marble