Moving onto chai for cleanliness
Finished up migration onto chai and corrected lint errors