Use constants in vector lengths
Remove usages of 'static' for methods