Some cleanup and missing breaks
Merge branch 'master' of github.com:rockyhe/rockykevinleon