Removed unnecesary code
Merge branch 'best-practices'