Updated a bunch of stuff to match formatting and logic