#159 Encapsulated the not so there is no confusion

#159 The code is now a little clearer