Minor styling changes and removal of parser