Better .h class

Current .h class can have small unpredictable effect on surrounding layout.
Thanks to @kaelig for suggestion.