Refactor

Everything's working now. :heart: