anhoej Improve code layout.