Improvements and refactorings

That doesn't do anything at all