Refactoring of functions.
Linux style function braces.
More re-factoring.