Major style cleanup