Fix apostroph missing in formula
Remove unintuitive @ constructor
Refactoring