Updates #1. Light refactoring.
Updates #1. Typo fix.