Code structure improvements.