LS: Cleanup
Merge pull request #46 from Nawuko/master

LS: Some minor cleanup/tweaks