Minor changes on :haircut: