Whitespace amendments
Minor amendments

Added support for quotes and removed some redundant styles
Removed mark-up assumptions