Minor cleanup

Inlines, wrong indentation, enums, private fields, etc