A bit of refactoring
Fixed doc pushing