Improving code structure.
Removing data-spy as it's not being used.