Major style changes (#27)