Code structure improvement