Small Optimisations

Adjusted some files to optimise them more.
Merge pull request #13 from VizuaaLOG/master

Small Optimisations