Minor cleanups
Merge pull request #18 from pmitros/pmitros/glitch

Minor cleanups