Minor update (0.6.1)

Updated main HTML output function to use case statement. Fixes #2
Cleaned up case statements