Made cleaner in next commit