simplify parsing of code blocks
resolve #24