Added comments & removed feature creep possibilities