Some fixing and cleaning