improved the code layout.