Tidy up method short circuit