Reduce size of methods - minor refactor just to make things easier to read
minor changes