Revert "Convert from class to instance methods."

This reverts commit 76979125d2e5e8f3b5ea3d88fd8bbcf6c74949a2.
Convert to instance methods.

Signed-off-by: Lennart Fridén <lennart@devl.se>