Feature/clean up

Not sure what 'Crift' means, but I trust your tools and expertise.