Made some organizational methods