Major style changes after feedback