Class and method modifiers

Should yield some speed increase.