Made some long methods not so long