Refactoring + fix of space in subjects