Removes Log method and refactors