base clean up + my personal config