Small refactoring; resurrected some styles that I accidentally