Optimizations/cleanup
Tests optimizations/cleanup
Merge pull request #1 from Eeems/master

Performance Optimizations / Code cleanup