Refactored to show awesome code

This code was not aware of how awesome it is, so I refactored it.