Reorder class initializer lists
Remove unused variables
Merge pull request #556 from Tilka/fix_warnings

Fix warnings