Refactoring some things;
Documentation refresh;