Fix indentation issues
Put definitions into header file