Removed all static methods

to emphasize OO style