Clean me up scottie. (horrible commit msg).