Minor refactor to simplify some methods