Typo / Code Organization

Typo / Code Organization