style(static): make more methods static or class