Code organization improvement