Fixed embedded code; added short word spacing parsing
Refactorization of content parsing