Minor tweaks
Cleaning some moar stuff.