Refactored Static code

Completed refactor of static code.