Fixed formatting and switch statement warnings
Merge pull request #227 from vaguilar/fix-warnings

Fixed formatting and switch statement warnings