Refactoring

+Fix minor issue.