Update + cleanup all

Basically general code cleanup. A few things made efficient and better
practices used because it's not 12 at night.