made everything a little easier to find/understand