Small touches final commit before the finishing touch