Minor optimizations, moved campos a bit higher
Merge pull request #1049 from Noiwex/refactor

Minor optimizations, moved campos a bit higher