code cleaning and setup crave path