Static Changes

Not sure if this is good coding practice but I think it is more
readable.