-Refactoring (mostly indentation). Removed debug/optimize modes.