Made some minor style and QoL changes