Small clean Up
Changes in conceptual things