Making the code more composable