WIP - styling updates

Working to clean up the rat's nest and conform to common coding style.