General refactoring
Another POTD