Fix files saving bugs + code cleaning