code cleaning, cache fixing