That would hopefully also clean up the method. It's honestly quite messy now.