Cleaning up code, going to start making the BuffUI