Code cleanup & a lot more

Too many thins to list here! :zzz: