Fixed some style, escaping & indentation problems