Cleaning up some styles. Refactoring a bit.