Refactor

Added some fairy dust to make it look slightly prettier.