Tidied backupand refactored feature files