Added more whitespace to grammer file and cleaned up parser output by removing
excess elements from generated tree