Renamed method to make more sense and tidied up