Code cleaning + debug info tweaks