Again minor refactor:)