Added refactoring, corrected asterisks