Further code reduction