Cleanup

Gonna begin running through here and updating some stuff. First pass is cleaning up some unused attributes, updating style a bit, etc. Shouldn't be any functional changes here.