Some small cleanup
Merge pull request #1 from sergi/cleanup

Quick small cleanup