cross brow formatting, multi file refactor, reduction of global vars...