Cleaning up mistakes and invalid code.

General clean up on a bad commit on my part from last night. Also styling for the newly edited markup conventions.