Cleanup: Optimized import, rearrange entries+spacing based on Leafnode coding profile