some beautifying....
Merge pull request #15 from luxid/luxid

some beautifying....