Moved methods around for more logical flow + change some comments