Add periods
refactor names