bootstrap clean up
reformat a bit and clean up
more typos and corrections
fix docblock messed up
Merge pull request #2 from cordoval/2-clean-up

clean up