Small fix + Cleaning