Minor changes to fix the last commit: I forgot to add some files and refactor some code.