Some nicer define indentation
Some code recordization code cleanup
Bump version to 0.5