Fixed issues from merge and PEP8 fixes
Added syntax highlighting