Make methods static for reuse elsewhere

Agree!