Performance improvements
Code cleanup: ran organize using and code formatting on all CS files
Merge pull request #21 from am11/master

Performance improvements