Fix indentation
A little better performing after playing around with forced inlining
Added -Winline
Tiny refactoring