Refactored in the latest commit, looks much better!