improved layout and commenting