updated based on PR (__all__, spacing, etc)