Ran all code through astyle