More functional & formatting improvements