Refactored, only as far as methods in model class (not PointSourceLens class). Closed #50