Formatting fix
Optimization
Merge pull request #3 from StanleyGoldman/Bugfixes

Formatting & Optimization