refactoring app to remove duplication of class initialization.
Also changed function of remove button to be more specific