added CircleEntity class
small code simplification