Use inner method to remove conditional