Minor cleaning
Basic point working