Xebia Author

refactoring