Fixed a label
Refactoried ...