major clean up
fixed formating issues
Merge pull request #11 from L1ghtn1ng/patch-3

major clean up