refactoring

narrowed scope to lateness and refactored properties