Static Methods Where Possible

Signed-off-by: Matthias Berndt <mb.systemtrap@gmail.com>