Clean code and add syntax hilight