Removing static methods to allow for easier testing later on.
Clean up all files and style.