Refactored dist files and fixed some corner case usage.