Misc tiding for readability, stuff