Shrunk some methods
Merge pull request #85 from lexware/master

Shrunk some methods